74. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:00:44 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

74.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/code/Mageplaza/LayeredNavigation/view/frontend/templates/layer/categoryfilter.phtml2022-04-22 07:34:10 +0000
2Porto v4.0.5/Porto Theme/app/code/Mageplaza/LayeredNavigation/view/frontend/templates/layer/categoryfilter.phtml2022-12-08 01:34:28 +0000

74.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged8130
Changed714
Inserted00
Removed00

74.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

74.4 Active regular expressions

No regular expressions were active.

74.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     ${MODULENAME} 17  * @package     ${MODULENAME}
18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21  21 
22 /** @var \Mageplaza\LayeredNavigation\Model\Layer\Filter\CategoryItem $filterItems */ 22 /** @var \Mageplaza\LayeredNavigation\Model\Layer\Filter\CategoryItem $filterItems */
23 /** @var \Mageplaza\LayeredNavigation\Block\Navigation\FilterRenderer\Category $block */ 23 /** @var \Mageplaza\LayeredNavigation\Block\Navigation\FilterRenderer\Category $block */
24 $filter = $block->getFilter(); 24 $filter = $block->getFilter();
25 $filterPathItems = $filterItems->getItems($block->getPath()); 25 $filterPathItems = $filterItems->getItems($block->getPath());
26 $filterModel     = $block->getFilterModel(); 26 $filterModel     = $block->getFilterModel();
27 ?> 27 ?>
28     <?php foreach ($filterPathItems as $filterItem) : ?> 28     <?php foreach ($filterPathItems as $filterItem)
: ?>
29         <?php 29         <?php
30         $hasChild = $filterItems->hasChildrenData($filterItem->getValue()); 30         $hasChild = $filterItems->hasChildrenData($filterItem->getValue());
31         $isExpandByClick = $block->isExpandByClick($filterItem); 31         $isExpandByClick = $block->isExpandByClick($filterItem);
32         $isSelected = $filterModel->isSelected($filterItem); 32         $isSelected = $filterModel->isSelected($filterItem);
33         ?> 33         ?>
34     <li class="item"> 34     <li class="item">
35         <?php if ($isExpandByClick) : ?> 35         <?php if ($isExpandByClick)
: ?>
36             <span class="icon-expand <?= /** @noEscape */ $isSelected ? 'active' : '' ?>"></span> 36             <span class="icon-expand <?= /** @noEscape */ $isSelected ? 'active' : '' ?>"></span>
37         <?php endif; ?> 37         <?php endif; ?>
38         <?php if ($filterItem->getCount() > 0) : ?> 38         <?php if ($filterItem->getCount() > 0)
: ?>
39             <input type="<?= /** @noEscape */ $filterModel->isMultiple($filter) ? 'checkbox' : 'radio' ?>" 39             <input type="<?= /** @noEscape */ $filterModel->isMultiple($filter) ? 'checkbox' : 'radio' ?>"
40                 <?= /** @noEscape */ $filterModel->isMultiple($filter) ? '' : 'name="' . $filter->getRequestVar() . '"' ?> 40                 <?= /** @noEscape */ $filterModel->isMultiple($filter) ? '' : 'name="' . $filter->getRequestVar() . '"' ?>
41                 <?= /** @noEscape */ $isSelected ? 'checked="checked"' : '' ?> /> 41                 <?= /** @noEscape */ $isSelected ? 'checked="checked"' : '' ?> />
42             <a href="<?= /** @noEscape */ $block->escapeUrl($filterModel->getItemUrl($filterItem)) ?>"> 42             <a href="<?= /** @noEscape */ $block->escapeUrl($filterModel->getItemUrl($filterItem)) ?>">
43                 <?= /** @noEscape */ $filterItem->getLabel() ?> 43                 <?= /** @noEscape */ $filterItem->getLabel() ?>
44                 <?php if ($filterModel->isShowCounter($filter)) : ?> 44                 <?php if ($filterModel->isShowCounter($filter))
: ?>
45                     <span class="count"><?= /** @noEscape */ $filterItem->getCount() ?> 45                     <span class="count"><?= /** @noEscape */ $filterItem->getCount() ?>
46                             <span class="filter-count-label"> 46                             <span class="filter-count-label">
47                                 <?= /** @noEscape */ ($filterItem->getCount() === 1) ? 'item' : 'items' ?> 47                                 <?= /** @noEscape */ ($filterItem->getCount() === 1) ? 'item' : 'items' ?>
48                             </span> 48                             </span>
49                         </span> 49                         </span>
50                 <?php endif; ?> 50                 <?php endif; ?>
51             </a> 51             </a>
52         <?php else : ?> 52         <?php else
: ?>
53             <input type="<?= /** @noEscape */ $filterModel->isMultiple($filter) ? 'checkbox' : 'radio' ?>" 53             <input type="<?= /** @noEscape */ $filterModel->isMultiple($filter) ? 'checkbox' : 'radio' ?>"
54                    disabled="disabled"/> 54                    disabled="disabled"/>
55             <span> 55             <span>
56                 <?= /** @noEscape */ $filterItem->getLabel() ?> 56                 <?= /** @noEscape */ $filterItem->getLabel() ?>
57                 <?php if ($filterModel->isShowCounter($filter)) : ?> 57                 <?php if ($filterModel->isShowCounter($filter))
: ?>
58                     <span class="count"><?= /** @noEscape */ $filterItem->getCount() ?> 58                     <span class="count"><?= /** @noEscape */ $filterItem->getCount() ?>
59                             <span class="filter-count-label"> 59                             <span class="filter-count-label">
60                                 <?= /** @noEscape */ ($filterItem->getCount() === 1) ? 'item' : 'items' ?> 60                                 <?= /** @noEscape */ ($filterItem->getCount() === 1) ? 'item' : 'items' ?>
61                             </span> 61                             </span>
62                         </span> 62                         </span>
63                 <?php endif; ?> 63                 <?php endif; ?>
64             </span> 64             </span>
65         <?php endif; ?> 65         <?php endif; ?>
66         <?php if ($hasChild) : ?> 66         <?php if ($hasChild)
: ?>
67             <ol class="category-items items level-<?= /* @noEscape */  $block->getLevel() ?>" <?= !$isSelected && $isExpandByClick ? 'style="display: none"' : '' ?> > 67             <ol class="category-items items level-<?= /* @noEscape */  $block->getLevel() ?>" <?= !$isSelected && $isExpandByClick ? 'style="display: none"' : '' ?> >
68                 <?= /* @noEscape */ $block->renderChildrenItems($filterItem->getValue()) ?> 68                 <?= /* @noEscape */ $block->renderChildrenItems($filterItem->getValue()) ?>
69             </ol> 69             </ol>
70         <?php endif; ?> 70         <?php endif; ?>
71     </li> 71     </li>
72     <?php endforeach; ?> 72     <?php endforeach; ?>